Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Oct 2011 19:09:55 +0000 (12:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Oct 2011 19:09:55 +0000 (12:09 -0700)

Trivial merge